Merged
Conversation
Changes: - docker-library/docker@5373612: Merge pull request docker-library/docker#262 from infosiftr/jq-template - docker-library/docker@12d1c27: Add initial jq-based templating engine
Diff for 9fc21e6:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 609ddb7..9b78433 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,19 +3,19 @@ GitRepo: https://github.com/docker-library/docker.git
Tags: 19.03.13, 19.03, 19, stable, test, latest
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 66c83a536259775694aa5d316426f3ff3ddcda6e
+GitCommit: 12d1c2763b54d29137ec448a3e4ad1a9aefae1a0
Directory: 19.03
Tags: 19.03.13-dind, 19.03-dind, 19-dind, stable-dind, test-dind, dind
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 93c19dff54de9876f736b3aa8026be5ad5987388
+GitCommit: 12d1c2763b54d29137ec448a3e4ad1a9aefae1a0
Directory: 19.03/dind
Tags: 19.03.13-dind-rootless, 19.03-dind-rootless, 19-dind-rootless, stable-dind-rootless, test-dind-rootless, dind-rootless
-GitCommit: 399f205733e0162fe6f6529fad8f2231b843606e
+GitCommit: 12d1c2763b54d29137ec448a3e4ad1a9aefae1a0
Directory: 19.03/dind-rootless
Tags: 19.03.13-git, 19.03-git, 19-git, stable-git, test-git, git
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 7a67842e7ff12c1426ae6a67ac1b7a701b51f3df
+GitCommit: 12d1c2763b54d29137ec448a3e4ad1a9aefae1a0
Directory: 19.03/git
diff --git a/docker_dind-rootless/Dockerfile b/docker_dind-rootless/Dockerfile
index e9f8cfc..d008731 100644
--- a/docker_dind-rootless/Dockerfile
+++ b/docker_dind-rootless/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM docker:19.03-dind
# busybox "ip" is insufficient:
@@ -15,24 +21,15 @@ RUN set -eux; \
RUN set -eux; \
\
-# this "case" statement is generated via "update.sh"
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
-# amd64
- x86_64) dockerArch='x86_64' ;; \
-# arm32v6
- armhf) dockerArch='armel' ;; \
-# arm32v7
- armv7) dockerArch='armhf' ;; \
-# arm64v8
- aarch64) dockerArch='aarch64' ;; \
- *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\
+ 'x86_64') \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-19.03.13.tgz'; \
+ ;; \
+ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \
esac; \
\
- if ! wget -O rootless.tgz "https://download.docker.com/linux/static/${DOCKER_CHANNEL}/${dockerArch}/docker-rootless-extras-${DOCKER_VERSION}.tgz"; then \
- echo >&2 "error: failed to download 'docker-rootless-extras-${DOCKER_VERSION}' from '${DOCKER_CHANNEL}' for '${dockerArch}'"; \
- exit 1; \
- fi; \
+ wget -O rootless.tgz "$url"; \
\
tar --extract \
--file rootless.tgz \
diff --git a/docker_dind/Dockerfile b/docker_dind/Dockerfile
index 37bcfa7..aa10b26 100644
--- a/docker_dind/Dockerfile
+++ b/docker_dind/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM docker:19.03
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
diff --git a/docker_git/Dockerfile b/docker_git/Dockerfile
index 2c8edb9..5fa563b 100644
--- a/docker_git/Dockerfile
+++ b/docker_git/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM docker:19.03
RUN apk add --no-cache git
diff --git a/docker_latest/Dockerfile b/docker_latest/Dockerfile
index 222ad58..395b13a 100644
--- a/docker_latest/Dockerfile
+++ b/docker_latest/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM alpine:3.12
RUN apk add --no-cache \
@@ -11,7 +17,6 @@ RUN apk add --no-cache \
# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf
RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
-ENV DOCKER_CHANNEL stable
ENV DOCKER_VERSION 19.03.13
# TODO ENV DOCKER_SHA256
# https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !!
@@ -19,24 +24,24 @@ ENV DOCKER_VERSION 19.03.13
RUN set -eux; \
\
-# this "case" statement is generated via "update.sh"
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
-# amd64
- x86_64) dockerArch='x86_64' ;; \
-# arm32v6
- armhf) dockerArch='armel' ;; \
-# arm32v7
- armv7) dockerArch='armhf' ;; \
-# arm64v8
- aarch64) dockerArch='aarch64' ;; \
- *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\
+ 'x86_64') \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz'; \
+ ;; \
+ 'armhf') \
+ url='https://download.docker.com/linux/static/stable/armel/docker-19.03.13.tgz'; \
+ ;; \
+ 'armv7') \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-19.03.13.tgz'; \
+ ;; \
+ 'aarch64') \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz'; \
+ ;; \
+ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \
esac; \
\
- if ! wget -O docker.tgz "https://download.docker.com/linux/static/${DOCKER_CHANNEL}/${dockerArch}/docker-${DOCKER_VERSION}.tgz"; then \
- echo >&2 "error: failed to download 'docker-${DOCKER_VERSION}' from '${DOCKER_CHANNEL}' for '${dockerArch}'"; \
- exit 1; \
- fi; \
+ wget -O docker.tgz "$url"; \
\
tar --extract \
--file docker.tgz \ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes: